Auto merge of #1360 - alexcrichton:new-io, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 27 Feb 2015 23:53:09 +0000 (23:53 +0000)
committerbors <bors@rust-lang.org>
Fri, 27 Feb 2015 23:53:09 +0000 (23:53 +0000)
cc @aturon, this is one giant commit.


Trivial merge